diff --git a/cpu/cpujit.py b/cpu/cpujit.py
index 591a8f26c73d3e1ed9fc2257a77faa7ee4545f89..af1d43471d37a6fa647c3e992605ef8f937aa39e 100644
--- a/cpu/cpujit.py
+++ b/cpu/cpujit.py
@@ -22,7 +22,7 @@ CONFIG_CLANG = {
     'compiler': 'clang++',
     'flags': '-Ofast -DNDEBUG -fPIC -shared -march=native -fopenmp',
 }
-CONFIG = CONFIG_INTEL
+CONFIG = CONFIG_GCC
 
 
 def ctypeFromString(typename, includePointers=True):
diff --git a/finitedifferences.py b/finitedifferences.py
index 442010f26afd27618a409b6185a9219e9ca0407b..b81a8fa48edad54fc0df2c490de34028a0130129 100644
--- a/finitedifferences.py
+++ b/finitedifferences.py
@@ -72,7 +72,7 @@ def discretizeStaggered(term, symbolsToFieldDict, coordinate, coordinateOffset,
       >>> term
       x*x^Delta^0
       >>> f = Field.createGeneric('f', spatialDimensions=3)
-      >>> discretizeStaggered(term, symbols=x, field=f, dx=dx, coordinate=0, offset=1, dim=3)
+      >>> discretizeStaggered(term, symbolsToFieldDict={ x: f}, dx=dx, coordinate=0, coordinateOffset=1, dim=3)
       (-f_C + f_E)*(f_C/2 + f_E/2)/dx
     """
     assert coordinateOffset == 1 or coordinateOffset == -1
@@ -113,7 +113,7 @@ def discretizeDivergence(vectorTerm, symbolsToFieldDict, dx):
         >>> x, dx = sp.symbols("x dx")
         >>> gradX = grad(x, dim=3)
         >>> f = Field.createGeneric('f', spatialDimensions=3)
-        >>> sp.simplify(discretizeDivergence(gradX, x, f, dx))
+        >>> sp.simplify(discretizeDivergence(gradX, {x : f}, dx))
         (f_B - 6*f_C + f_E + f_N + f_S + f_T + f_W)/dx
     """
     dim = len(vectorTerm)
diff --git a/gpucuda/kernelcreation.py b/gpucuda/kernelcreation.py
index a9af8361a926cb050ef4a0be0c2e198832f8b5e1..1251e76a5143d95c7e38e6a7176db698eddd5b91 100644
--- a/gpucuda/kernelcreation.py
+++ b/gpucuda/kernelcreation.py
@@ -2,8 +2,8 @@ from collections import defaultdict
 
 import sympy as sp
 
-from pystencils.generator import resolveFieldAccesses
-from pystencils.generator import typeAllEquations, Block, KernelFunction, parseBasePointerInfo
+from pystencils.transformations import resolveFieldAccesses, typeAllEquations, parseBasePointerInfo
+from pystencils.ast import Block, KernelFunction
 
 BLOCK_IDX = list(sp.symbols("blockIdx.x blockIdx.y blockIdx.z"))
 THREAD_IDX = list(sp.symbols("threadIdx.x threadIdx.y threadIdx.z"))
@@ -65,7 +65,6 @@ if __name__ == "__main__":
     latticeModel = makeSRT(getStencil("D2Q9"), order=2, compressible=False)
     r = createLbmEquations(latticeModel, doCSE=True)
     kernel = createCUDAKernel(r)
-    print(kernel.generateC())
 
     from pycuda.compiler import SourceModule