Couple of bugs fixed in installer