More code blocks fixes