Fix imports so we have no warnings