replace a few ints with enums