Minor fixes

(spotted while preparing publication of the FPWD)