Couple tweaks to make installation more accurate