Added some compatibility conditionals