Fix schema syntax problems

Hadn't actually tested it in a while.