possible fixes to possible deadlocks