Fixed any rogue class definition in guarded packages