Few more beta bug fixes

This nails the 2 biggest crittersism reports.

Can we get another beta out?