Fix notification variables, add fallback for machinename