Bundle fixes from the libraries