Fixed issues with tables, rinfo and rinfo_s