Clean up and extract fixers from the version