Align with the latest BeQt changes