CS fixes
Locking some version constraints
Pulled in the latest version of "fixer"