Increase compatibility with metaware tools