CS and namespace fixes.