Fix deprecated create forms