CS Fixes

Once of two pull requests to replace #86.