Changes for compatibility with oF 0.8