Bug fixes for CSSS