Doing fixes for the library for pre-ICS versions.