minor fixes based on feedback from Antoine Trux