fixed up issues found by lint tests