Some more finetuning arround the bufferindicator