Keep on trying to fix build to work on 3.7.2 and 4.3M7!