Editor fixes

Id