Fixing Binary.cpp and other things