Fixed dependency management ... probably