More quick-edit fixes