Cleaning up minor things in database build script