Fixed some bugs found through acceptance testing for Bocce