Fixes of things that did not need to be changed, but do now.