Fix issues with 1.5.6 support