Fixes on QS 3.0