T: Some fixes