Fix feedback from Hywan and Circlecode