Fix work channel deadlock and temporary fix for filesystem race bug