Fix typo and create compatibility macro