Fixed uninitialized constant errors