Fix some inconsistencies for binary build