Fixes to the static runtime generation