Some fixes related to blocker changes