Some slight improvements.