Beta fixes 1

Fixes for some of the  things found overnight and today.