Fix JIRA #LRA-124 issues and other minor updates