Old static casts which compile now break, so I am fixing them slowly