Beta42bug fixes

A couple more bug fixes before we release beta42