Switched build path to universal