Fix build errors

Thanks to Benjamin !