Some code block fixes..