compilation fixes missed in the previous commit