Merge "Various fixes in bspatch and File class."