basic fixes to work with current game