Should fix a few issue with overriding blocks.