More DB setup + Fixes to Locations