Beta42bug fixes

A few more bug fixes before we release beta42