Include several changes after checking out yesterday