More fixes for (portable) Vanilla installer