Bugfixes: minor syntax problems