More fixes on blocks