Fix bugs from updated engine dep.