Fixes for blocking