More stuff in updating to 1.7