LIMBO: Minor fixes

Minor fixes