Small improvements for fetch