Some 1.8 changes