Fixes after some format defaults changed