#881 Fix issues in installer