Page number fixes