Fixed bugs for Editor

Fixed bugs for Editor