two small improvements