Avoid some still left build warnings