Initial Beta 2 bug fixes.