Case fixes