Further liftoff improvements