Fix edit inconsistencies