Fix up the snom fixes