Hopefully fixes some splint warnings