Fix return value of block
Correct saving replacement history