Fixes on blocks