Get things building again; qualify imports