Fix JIRA #LRA-137 issues.