Fix application creation etc