* Some template and driver fixes