small fixes for Sams