Fixes for blocking code, and a fix to a defective method