Fixed blocked and close errors for the time being