Bug fixes for rc4

a number of small fixes based on crash reports in hockeyapp that had a large number of submissions