WouterJ review fixes