Fix bugs regarding dss dependencies.