Follow up on comments from mzr