Add defaults for linking/volumes