Misc minor modifications

cf commits log