Fixed blocking bugs