Small format fixes