Better Lint compat