Some fixes and improvements to builder APIs: mainly, do not set a value if not provided by the builder.