Syntax fixes (submitted by Daniel Lemper)