Add patches for swift support