Changed some const uints to enums