Minor refinements and bug fixes for RLI implementation