Minor final additions