Fix patches and build path