Add some compatibility conditionals