Minor Bug Fixes
Beta 2