Cosmetic changes plus one double free