Fix compilation problems in new runtime