fixes for beta 6