Adds support for 1.7.2 and fixed 1.6.x errors