Helgrotha/Lysra RW fixes