Fixed some initial problems with new settings.