Fix some fallback from switch to 64bit IDs