important bugfixes / memcheck trigger prevention