More robust install process