Minimal Changes to Build System and Several Small Improvements to Copy