fixes for beta 5