Fixes map and ranking issues