Updates for rum 6.6