More adjustments for ShadowServer