Minor changes to runtime