Fixing minor conflicts due to new game cache.