Fixing editing, resorting, etc.