Fix raw blocks