Fixing misc. crashes from v1.1.0 beta.
merge