restws-346 fixes