Fixed 1.7 related stuff