Minor changes and fixes everywhere related to prior commits.