Small fixes after a customer review