Further little changes