fixes to Sams issues