Tweak fixed + removed CM Advanced Settings