Additional changes to make 3.9 work on x86_64 Linux