Tried to fix some more splint warnings