Fix first batch of bugs from beta test.
Fix second batch of issues from beta test