compatibility fixes for android 1.6-2.3; catalog