- Fixes validation of paginator
 - Fixes missing fluent returns and updates interfaces to match