Fixed MP crashes/bugs due to merge