Fixed lint problems