A few changes to correct errors as a result of copying and pasting code from an older project.