bug fixes for android...