Merge "Fix Windows warnings." into ub-games-master