Some Settings code update.