Various little fixes

In syntax, etc