Some slight improvements