Fixed some binary related quirks.