Fixed paths and template issues