More fixes after feedback