Updates and fixes for Holo version.