Fixes for crashes from DO stuff.