Updates to work with latest Fluent