Fixed unused case warnings