Fixed errors from modified settings structure