Update some code for more recent tipp 1.5 changes