Beta test fixes

Test failure fixes