Fix a few things with blocks