Fix all issues properly execing