JOJ-57: Small changes following merge and code review