Compilation fixes reported by icc