Minor fixes to block pasing