Minor lint and hint fixes