Addressed more thread sync issues.