Merge pull request #2673 from SkyMarshal/bugfixes

See description
Fixes the runtimes.