More fixes for upload and labelling and localechain