Fix edit utilities