More Format fixes