Fixed some racing issues in Scene