Minor fixes on precedence etc.