fixed build issues moving to beta 6