More rna_def support and a few fixes