Clean up version build issues.. I think.