Lint and File lock fixes