some 1.8 updates