Fixes to build options.