Fixes on labels and output files