fix compilation breakages from the last commit