Fixes for beta5
Merge remote-tracking branch 'bkase/beta5-fixes'