Fix LRA-167 issues and other minor updates