With these changes, installation works well.