Replaced all of the v1_7_R4 with V1_8_R1 so at least some of it works now...