Fixing more Default template entries.