Fixes to gamestate