more storage leaks fixed