Bug fix in installer and config