Avoid some ubsan warnings

Waqar Ahmedrequested to merge
work/avoid-warngs into master

Ubsan is unhappy about casting to our class

Merge request reports