rml bugs fixing