More oil block fixes.