LRA-192 partial fixes