Fixed issues reported by findbuds reporting tool.