"Handle" some un-handled cases... most of these are leftovers