RESTWS-339: Post review fixes