Better handle OS boxes.
Fix typo.
Merge branch 'os-boxes' into 4374