Fix Process bugs