Minor tweaks, additional crash fix