Fix order of build options