Fitz's Fixes