Fix inline-form and DI improvements