Fixups during testing on WordPress corpus