Improved Installer Fix

Incorporated improvements from Alistair to previous checkin.

Change-Id: Ic1536f0662e6cd1bcbeb6b0897912e5d7d88acba