Small fixes from John's suggestions