LIMBO: Small fixes and improvements

Small fixes and improvements