A few fixes related to settings and dispatcher