Use PS instead of FLocation in a few places.