CS and fix NULL invalid return types