Generic static adjustments

This changes are necessary to build the generic-static2-mb branch of d-p.