Removing all the domain run calls, only needs to be one, in the entry point
Fixed some potential crashes