More fixes for SNI.