More schema changes
Fix some initialization code