lean support & fixes