minor fixes, encap of block restart