Fix that was partially preventing editing; cleanup