Various improvements - os q5