Fixup project references for GH4W - DONT MERGE THIS INTO MASTER