[Static SQL -> Dynamic SQL] Change some functions where missed...