lukew3 lint fixes