Tiny format fixes