Fix places bugs