Fixed errors found by lint