RESTWS-350: Post review fixes