Make editing work well