Disabled checks and fixed depends