Last minute fixes for r11