Cleaning up some analyzer warnings