Fix issues for 1.5.1