Fixing up Editor initialization