Editor Fixes