fixes for s-buffer