Fixed some silly oversights in editor changes to accomodate external ref
resolution