Sir Trevor: set correct block types