Double free fix and firmware 2.1