Modify some expressions