Fixing more awesome bugs with the DB commands. Checking in should be
working after this... *crosses fingers*