A few small improvements