2.18.1 === - A couple of crasher fixes.