Fix a few issues with Block Replacer.