Minor tweaks. Thanks Ken, German and Bernhard.