Fixed installer bugs while testing