Fix issues with constants under 1.8.7.