Fixup unbound build options