Some minor database changes, mainly horrible workarounds