Update everything so that things work