Fixing dependencies
Updated subprojects