small fixes for buffer save