Bug-fixes

Connor