Fixes for Beta 4

Fixes a few nasty issues being reported.

This one is going into develop, so needs a release merge.