Fix JIRA #LRA-141 issues