Maddy's Fixes