More minor cs fixes
Merge branch '4.1'