This change and the one above are drive-by fixes unrelated with the patch