File and Editor Fixes