Merge "Fix threading issues"