shell: Add missing cases to switch statements for surface types