Fixes based on staging failure.
Merge pull request #2414 from jberkus/createdbfixes

Fixes based on staging failure.