General syntactical bugfixes.