Terry fixes