Code block fixes