Pull in fixes to mmccopy and fwtool