Fix 64bit enums and switch cases