beta 2 release fixes