Fix Gerry's Fixes