More engine/editor sync