Patched lint errors