Some LanderBase fixups + remove unused imports.