Fix "resource appears in overlay but not in the base package" errors