Some other changes that don't fix it