Fixed: Spent some quality time with Valgrind...