[PATCH 2/4] Collect addon paths properly