Polish for 0.16.0