Remove erroneous call + fix template paths...