Fixes Pt. 2