More small tweaks to runtime