[SP] Cleanup/warning fixes for both SP games.