Some loose ends that didn't get in the first commit