Further tinkering to get all ue4 and non-ue4 build modes working.