Updates to specs and fluent modules