Fixes some of Cruze's stuff