Some fixes for the landing