Some Lint deprecation & resources fixes