fix up scan and hlint warnings