Update with rns fixes