corner cases

More cases.