Sam's Fixes