Fixing syntax errors in Blocks
Fixed syntax errors brought by merge