Fix building problems, add clean option