Merges both patches previously applied. Also seems to change the path that the library is written to.