Changes to fix AlienBaseSafe (not successful)