Fixes to game mechanics