Fixes for fencer and smtp settings