Fixing lint troubles