Fixed couple of warnings found with golint.