Final fix for file-template issues