Patch a couple build bugs and bump versions