Fix block manager issues