fix common build prop overrides