[JDF-300] - Small improvements.