Some patches needed to build successfully