Small fixes for the sake of consistency
Merge pull request #1708 from crtlib/patch-2

Small fixes for the sake of consistency