fixes for initial database