Fix issues with dependencies not being present