RLS - resolve minor issues.