Added fetch size to places that needed it.