NO-JIRA: Fix dependecy checks
2 files changed