Forward port fixes for problems reported by valgrind