Block parsing fixes