Get rid of a few obvious errors

Syntax errors and duplicate defines