Some minor fixes/changes.