Various binary processing changes