Update libraries to work with our setup. It's ugly, but it works