Fix layout problems with EHS disabled
3.0.3.8