Minor fixes - see document