Mango improvements & fixes