Cosmits and small fixes