Additional fixups

Merging the rename commit and usb commit broke this pull
but these changes fix it up.