Fixed issues reported by lint.