CS fixes for #3754

This PR has CS fixes for #3754, so that one should be merged first.