Changed some options to facility 32b/64b changes