Further fixes for Ceylon 1.1