Add a few weird cases