Better handle OS boxes