corner case fixups