Cleanup and awkward special cases