CS, fix missing returns