PAX ASLR/SEGVGUARD Fix some breakage from the previous commits.