Fixes on settings