Fix some expressions