Minor changes

command_stream_t, grabBuffer