Clean up of some bugs found during user testing