Your proposed modifications sound good. Be sure to label your windows build as windows in the final submission.
