small cs fixes