Small cs fixes