fix hlint complaints