Reflecting engine changes, some init task improvements