Clean up build errors when creating/recreating database schema