Some 1.8.0 updates