Fixed some SQL errors.

Also changed catch-up to explicitly use /vagrant/catch-up.