RESTWS-311: Post review fixes