more fixes for buffer/disk move thingy