QS: Some fixed
Frameworks: Update 2