Edits for semo-server support.