Fixes for administrative editing