fixing term type issues