Game Logic fixes