Fixes for LocationField