A couple small improvements