Further small improvements