Fixes for #4: track page size optimization