Some more cleanup issues