Minor improvements here and there: