Include gillesguillemin fixes