Fix handling of raw deps