Further app generator improvements