General format fixes