CW-324 Small fixes vacancies