Minor changes to get client/srv I/O