Create DB objects tweaks/fixes