Updating submodules, and fixing some database stuff