Minor fixes and changes to runtime escape