Fix cs issues for PR #138