2 small improvements