- Minor tweaks to runtime