fixes for completion, buffering and scheduling