Fixing a variety of changes.