Bunch of misc changes.