Small fixes (need additional checking for city)