Beta Bugs

Hopefully the last few fixes.

This is going into release, so needs to be merged into develop also.

I reckon we are good for beta 3 now?