Fixed more uninitaized constant errors.