Fix outstanding bugs for installation phase 1.