Fixes for SRV