Minor bug fixes
Beta 2