Minor updates on database and utils to get 0.9.9 done.