SMS setup bugfixes