A few minor changes

Here are a few minor changes with an eye toward moving to ARC and upgrading some of the projects' dependencies.