Improve binary locator to be more deployment friendly.