Minor updates for Beta 5