Fixed 1.7 stuff