fixed couple issues caused by FluentSharp assembly rename