Code fixes for soap server