Several things to fixxxx