Syntaz fixes