Updates from lint