Address multi-threading issues in SI95