houndci suggested fixes.