Make small fixes