Hotfixes that allows database to work in Pagoda.