Add debug page limit etc