Fixed more labels and auth