Static fixes for thread safety for CondCore