first fixes for beta 3 changes