CARE #78: Fixed a few minor issues