Fix references to Runtime