Adjustments for compatibility with Wikindx3