CLI/new more project generator fixes