Hopefully fixing some bad references post metafile integration