memleak fixes ;)