Some editing niceties