Fix import references