Reordered the code and managed to get a clean install. We still lack proper icon installation.