Some updates to suppress splint warnings etc.