LRA-162 and LRA-163 fixes