small fixes on asan
Merge pull request #15 from badeleux/master

small fixes on asan