Fix no_split and no_buffer