fix some expressions