Fix CS
Fix fixtures