some more fixing of host specific behavior