Small Format Fixes