More fixes to parameterized builds - still broken.