Fix template and node inclusion