Fixed a few more DB issues