Expression fixes