More enum fixes