More freaking VersionEditor fixes