More clean up fixes