Bring spadrino fix for blocks to my fork