More export and installation fixes