fixes for full runtime integration