Fixing template issues.