Minor changes to general settings