Added some fixes to the process