CAR-107 bug fixes.