FIXME: fixup missing referenced files errors