Fix binary problems