Applied Seth's Fixes