Fixing format bugs