Fix issues with 6.1.x