Minor overall fixing.