some fixes to blocker