Metafile fixes