Fixing static analyzer issues. One was actually a memory leak. :O