Minor adjustmens after review of PR#790