Merge "Fix some issues reported by Valgrind"