Several fixes from prior commits
dss: Makefile: Fix