Debug changes for switch-over to postgres database.