Fixed some git snafus to do final build