Fix up application