Fixes the runtimes.
Merge pull request #2675 from SkyMarshal/bugfixes

Fixes #2674