Fixes for paging, factory module syntax