Interactive editing fixes