[V2.2] Format Fixes