Fixed some bugs that were created when changing Owner