Clean up a few final issues related to settings