Fix up server/dev dupe packages