Thermo- and Photo-annealing of ZnO Nanocrystals