more enum fixes