Minor bug fixes for Rathazul and Katherine.