apply fixes based on feedback from tianon