Updates fixing various things