Add missing default cases to some switches