Fixes for game over bugs. #400. #401.