Update for the library and media fixes