Fix sorting + build version