Minor UI tweaks (disabling editing in some corner cases