Fixed dependencies
Fixed dependencies more