Handle a few more cases