Number of fixes to take into account the new FluentSharp dll names