[JDF-288] - Small changes.