Fixed settings issues and missing arguments