Just be happy Jenkins :-) more comments fixes