Changes to the third party libraries to fit into the build system