Beta bug fixes

@JamesDuffy i want to leave this one open whilst i test out the fixes.

Once i'm happy i'll merge into release for the next beta :)