More inline form fixes