Simple lint fixes done