Minor changes to make the library running.