Runtime fixes
Merge pull request #282 from alex-gh/mutiny_runtimes

Runtime fixes