Case fixes more.