Minor changes to bin for local mode