Couple small improvements