Fixed dependencies
Several intermediate changes