Fixes on fluent API.