Changes for new 32/64bit build systems