Added missing switch cases to calm compiler warnings.
Fix even more compile warnings.