Minor fixes to make created and upgraded databases equal.