Updates for beta 3 compatibility