Fix some more
More expressions