Syntax errors and fixups