update patches and fix compile error