Fixed lint bugs