Fixing 'clean' targets upsteam, and debug issue 1