Fix JIRA LRA-104 and other bug fixes/enhancements