Other updates to 1.8.0