fixing build errors from out-of-band changes. mapping enum columns.