Cleaned up some new valgrind warnings