QS 3.1: fix build errors