- Fixed build and valgrind logs