Add avoidance of EXC_BAD_ACCESS (Thanks! @darnel-urbandaddy)
Undo changes in intrinsicContentSize calculation method (Thanks! @phattman)