Fixing some compilation problems
Merge commit '887d5c196f03f01c2a1273cb986c468a3074e294'
modifcation