More 1.8 updating