Various cleanup to build parameterization