srvent fixes