Minor bug fixes
Change back to local DB