more architecture build setting fixes