Update for terminology 6.1 - fix all warnings