Some fixes which i would like to test