Second level host fixes