minor fixes for compatibility with latest OF