Fix some crashes in the new engine...