Minor modifications to make the installation more easily