Minor modifications to various settings