Fixes for gcc for -Werror=switch.