Trivial static fixes for thread safety for CalibFormats