Blocks of code fixed