fix things as reviewed by Alberto