Fix binding redirects for clean build and test