Fix JIRA LRA-105 and other bug fixes/enhancements