Make installation more robust