Binaryfile fixes