Fixed block syntax issues
Merge