Fixed a few more switch warnings.