Some changes to try and get AlienBaseSafe working