JSON fixes for Androdi 4.3 and lower